Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 28 May 2011 18:31:51 +0000 (11:31 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 28 May 2011 18:31:51 +0000 (11:31 -0700)
commit53680e79523af36698ec5dc6b2088b1abe64f501
treeefe281155ee8c4f835b75b16c4b10805e93b6a19
parent30a2791f705b8090f63f6772cfc354c5dcbb3b4b
parente567d9977e3744f063f5025084c142dc3fe2759c
Merge from trunk.